]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
build: Move metainfo version check into distscript
authorFlorian Müllner <fmuellner@gnome.org>
Tue, 31 Aug 2021 10:25:28 +0000 (12:25 +0200)
committerFlorian Müllner <fmuellner@gnome.org>
Sat, 4 Sep 2021 21:46:46 +0000 (23:46 +0200)
The time we really care about current release information in appdata is
when preparing a release, not during regular builds.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1968>

subprojects/extensions-app/build-aux/meson/check-version.py [new symlink]
subprojects/extensions-app/data/metainfo/meson.build
subprojects/extensions-app/meson.build

diff --git a/subprojects/extensions-app/build-aux/meson/check-version.py b/subprojects/extensions-app/build-aux/meson/check-version.py
new file mode 120000 (symlink)
index 0000000..fbe6c74
--- /dev/null
@@ -0,0 +1 @@
+../../../../meson/check-version.py
\ No newline at end of file
index 4406a3e5bde4a80a5c4340177ab6ced1dd95734d..c4962c0576d65775db01bfe791d2674ff11c2c1b 100644 (file)
@@ -13,13 +13,4 @@ if (appstream_util.found())
     args: ['validate', '--nonet', metainfo],
     workdir: meson.current_build_dir()
   )
-
-  r = run_command(appstream_util, '--help')
-  if (r.stdout().contains('validate-version'))
-    test('Checking release entry for @0@'.format(meson.project_version()),
-      appstream_util,
-      args: ['validate-version', metainfo, meson.project_version()],
-      workdir: meson.current_build_dir()
-    )
-  endif
 endif
index 24abe118da08b9680785513afa07fba3ef4b8419..da539ed04f4b4be7073a3be35c51efdf9242873a 100644 (file)
@@ -62,6 +62,13 @@ if not meson.is_subproject()
 
   meson.add_install_script('build-aux/meson/postinstall.py')
 
+  if appstream_util.found()
+    meson.add_dist_script('build-aux/meson/check-version.py',
+      meson.project_version(),
+      '--type=metainfo',
+      'data/metainfo/org.gnome.Extensions.metainfo.xml.in')
+  endif
+
   summary_dirs = {
     'prefix': get_option('prefix'),
     'bindir': get_option('bindir'),